From c6bf7f0c5fdb9738829ae74d3427610690666a6d Mon Sep 17 00:00:00 2001 From: Elliot Lee Date: Mon, 7 Aug 2000 03:26:05 +0000 Subject: [PATCH] Warning fixes. --- gdk/linux-fb/gdkdrawable-fb2.c | 4 ++++ gdk/linux-fb/gdkfont-fb.c | 1 + gdk/linux-fb/gdkgc-fb.c | 3 +++ gdk/linux-fb/gdkimage-fb.c | 1 + gdk/linux-fb/gdkinput-ps2.c | 11 +++++++++-- gdk/linux-fb/gdkmain-fb.c | 8 ++++++++ gdk/linux-fb/gdkpango-fb.c | 2 +- gdk/linux-fb/gdkproperty-fb.c | 2 +- gdk/linux-fb/gdkwindow-fb.c | 2 +- 9 files changed, 29 insertions(+), 5 deletions(-) diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c index 8867826872..3384ad49bd 100644 --- a/gdk/linux-fb/gdkdrawable-fb2.c +++ b/gdk/linux-fb/gdkdrawable-fb2.c @@ -306,6 +306,10 @@ gdk_fb_fill_span(GdkDrawable *drawable, GdkGC *gc, GdkSegment *cur, GdkColor *co GdkFunction func = GDK_GC_FBDATA(gc)->values.function; cmask = GDK_GC_FBDATA(gc)->values.clip_mask; + clipxoff = clipyoff = tsxoff = tsyoff = 0; + mask_rowstride = 0; + solid_stipple = FALSE; + clipmem = NULL; if(cmask) { clipmem = GDK_DRAWABLE_IMPL_FBDATA(cmask)->mem; diff --git a/gdk/linux-fb/gdkfont-fb.c b/gdk/linux-fb/gdkfont-fb.c index 0bc0e4d866..e55f477905 100644 --- a/gdk/linux-fb/gdkfont-fb.c +++ b/gdk/linux-fb/gdkfont-fb.c @@ -26,6 +26,7 @@ #include #include +#include #include "gdkfont.h" #include "gdkprivate-fb.h" #include "gdkpango.h" diff --git a/gdk/linux-fb/gdkgc-fb.c b/gdk/linux-fb/gdkgc-fb.c index 5c75182521..3e166cf81f 100644 --- a/gdk/linux-fb/gdkgc-fb.c +++ b/gdk/linux-fb/gdkgc-fb.c @@ -1,3 +1,6 @@ +#include +#include + #include "gdkprivate-fb.h" #include "gdkgc.h" #include "gdkfb.h" diff --git a/gdk/linux-fb/gdkimage-fb.c b/gdk/linux-fb/gdkimage-fb.c index 3eb994fc58..717e1896f0 100644 --- a/gdk/linux-fb/gdkimage-fb.c +++ b/gdk/linux-fb/gdkimage-fb.c @@ -33,6 +33,7 @@ #include #include +#include #include "gdk.h" #include "gdkimage.h" diff --git a/gdk/linux-fb/gdkinput-ps2.c b/gdk/linux-fb/gdkinput-ps2.c index 35f088fb9c..cc4ddb2828 100644 --- a/gdk/linux-fb/gdkinput-ps2.c +++ b/gdk/linux-fb/gdkinput-ps2.c @@ -32,6 +32,7 @@ #include #include #include +#include /* * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS @@ -483,10 +484,14 @@ handle_input(GIOChannel *gioc, GIOCondition cond, gpointer data) int n, left, dx=0, dy=0; PS2Mouse *mouse = data; gboolean new_button1, new_button2, new_button3; - time_t the_time = g_latest_time.tv_sec; + time_t the_time; + GTimeVal curtime; GdkWindow *mousewin; gboolean got_motion = FALSE; + g_get_current_time(&curtime); + the_time = curtime.tv_usec; + while(1) /* Go through as many mouse events as we can */ { for(left = sizeof(buf); left > 0; ) @@ -1036,13 +1041,15 @@ handle_keyboard_input(GIOChannel *gioc, GIOCondition cond, gpointer data) int i, n; Keyboard *k = data; time_t now; + GTimeVal curtime; n = read(k->fd, buf, sizeof(buf)); if(n <= 0) g_error("Nothing from keyboard!"); /* Now turn this into a keyboard event */ - now = g_latest_time.tv_sec; + g_get_current_time(&curtime); + now = curtime.tv_sec; for(i = 0; i < n; i++) { diff --git a/gdk/linux-fb/gdkmain-fb.c b/gdk/linux-fb/gdkmain-fb.c index e2b48c473d..f506537c37 100644 --- a/gdk/linux-fb/gdkmain-fb.c +++ b/gdk/linux-fb/gdkmain-fb.c @@ -571,7 +571,15 @@ gdk_event_make(GdkWindow *window, GdkEventType type, gboolean append_to_queue) if(evmask & type_masks[type]) { GdkEvent *event = gdk_event_new(); +#if 0 guint32 the_time = g_latest_time.tv_sec * 1000 + g_latest_time.tv_usec / 1000; +#else + guint32 the_time; + GTimeVal gcurtime; + + g_get_current_time(&gcurtime); + the_time = gcurtime.tv_sec * 1000 + gcurtime.tv_usec / 1000; +#endif event->any.type = type; event->any.window = gdk_window_ref(window); diff --git a/gdk/linux-fb/gdkpango-fb.c b/gdk/linux-fb/gdkpango-fb.c index 785b53c1c2..08c005dd6d 100644 --- a/gdk/linux-fb/gdkpango-fb.c +++ b/gdk/linux-fb/gdkpango-fb.c @@ -111,7 +111,7 @@ pango_fb_font_map_load_font(PangoFontMap *fontmap, { PangoFBFontMap *fbfm = (PangoFBFontMap *)fontmap; PangoFBFont *retval; - PangoFBFontListing *fl; + PangoFBFontListing *fl = NULL; int i; PangoFontDescription d2; diff --git a/gdk/linux-fb/gdkproperty-fb.c b/gdk/linux-fb/gdkproperty-fb.c index 12cdec9eea..f32f78a93b 100644 --- a/gdk/linux-fb/gdkproperty-fb.c +++ b/gdk/linux-fb/gdkproperty-fb.c @@ -145,7 +145,7 @@ gdk_property_change (GdkWindow *window, { GdkWindowFBData *fbd = GDK_WINDOW_FBDATA(window); GdkWindowProperty *prop, *new_prop; - int new_size; + int new_size = 0; GdkEvent *event; g_return_if_fail (window != NULL); diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c index 8f7f544db3..5b0e9c6920 100644 --- a/gdk/linux-fb/gdkwindow-fb.c +++ b/gdk/linux-fb/gdkwindow-fb.c @@ -784,7 +784,7 @@ gdk_fb_window_move_resize (GdkWindow *window, if (!private->destroyed) { - GdkRegion *old_region; + GdkRegion *old_region = NULL; GdkRectangle old_rect; if(private->input_only) -- 2.30.2